From c0247431290955082f2df8056a70804aa51636d9 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Fri, 19 Feb 2016 13:37:55 -0800 Subject: [PATCH] Remove SourceSet This isn't used anywhere --- src/cargo/core/mod.rs | 2 +- src/cargo/core/source.rs | 59 ---------------------------------------- 2 files changed, 1 insertion(+), 60 deletions(-) diff --git a/src/cargo/core/mod.rs b/src/cargo/core/mod.rs index b0b0895f0..aa2c75d1a 100644 --- a/src/cargo/core/mod.rs +++ b/src/cargo/core/mod.rs @@ -6,7 +6,7 @@ pub use self::package_id_spec::PackageIdSpec; pub use self::registry::Registry; pub use self::resolver::Resolve; pub use self::shell::{Shell, MultiShell, ShellConfig, Verbosity, ColorConfig}; -pub use self::source::{Source, SourceId, SourceMap, SourceSet, GitReference}; +pub use self::source::{Source, SourceId, SourceMap, GitReference}; pub use self::summary::Summary; pub mod source; diff --git a/src/cargo/core/source.rs b/src/cargo/core/source.rs index 74446f0eb..8cc679858 100644 --- a/src/cargo/core/source.rs +++ b/src/cargo/core/source.rs @@ -443,65 +443,6 @@ impl<'a, 'src> Iterator for SourcesMut<'a, 'src> { } } -/// List of `Source` implementors. `SourceSet` itself implements `Source`. -pub struct SourceSet<'src> { - sources: Vec> -} - -impl<'src> SourceSet<'src> { - pub fn new(sources: Vec>) -> SourceSet<'src> { - SourceSet { sources: sources } - } -} - -impl<'src> Registry for SourceSet<'src> { - fn query(&mut self, name: &Dependency) -> CargoResult> { - let mut ret = Vec::new(); - - for source in self.sources.iter_mut() { - ret.extend(try!(source.query(name)).into_iter()); - } - - Ok(ret) - } -} - -impl<'src> Source for SourceSet<'src> { - fn update(&mut self) -> CargoResult<()> { - for source in self.sources.iter_mut() { - try!(source.update()); - } - - Ok(()) - } - - fn download(&mut self, packages: &[PackageId]) -> CargoResult<()> { - for source in self.sources.iter_mut() { - try!(source.download(packages)); - } - - Ok(()) - } - - fn get(&self, packages: &[PackageId]) -> CargoResult> { - let mut ret = Vec::new(); - - for source in self.sources.iter() { - ret.extend(try!(source.get(packages)).into_iter()); - } - - Ok(ret) - } - - fn fingerprint(&self, id: &Package) -> CargoResult { - let mut ret = String::new(); - for source in self.sources.iter() { - ret.push_str(&try!(source.fingerprint(id))[..]); - } - Ok(ret) - } -} - #[cfg(test)] mod tests { use super::{SourceId, Kind, GitReference}; -- 2.30.2